From 7f4105bcaf3a8f9a89e19a46e5bd6e6588b9ff7f Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Fri, 5 Sep 2014 15:05:25 +0200 Subject: [PATCH] Adwaita: tranlucent shadows inside entries So evo background changing entry doesn't look broken. --- gtk/resources/theme/Adwaita/_common.scss | 13 ++-- gtk/resources/theme/Adwaita/_drawing.scss | 14 ++--- .../theme/Adwaita/gtk-contained-dark.css | 61 +++++-------------- gtk/resources/theme/Adwaita/gtk-contained.css | 61 +++++-------------- 4 files changed, 44 insertions(+), 105 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 0c7cafad51..032a292104 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -591,22 +591,21 @@ $_dot_color: if($variant=='light', $selected_bg_color, // all the following is for the +|- buttons on inline toolbars, that way // should really be deprecated... .inline-toolbar GtkToolButton > .button { // redefining the button look is - // needed since those are flat... + // needed since those are flat... @include button(normal); &:hover { @include button(hover); } - &:active { @include button(active); } + &:active, &:checked{ @include button(active); } &:insensitive { @include button(insensitive); } - &:insensitive:active { @include button(insensitive-active); } + &:insensitive:active, &:insensitive:checked { @include button(insensitive-active); } &:backdrop { @include button(backdrop); }; - &:backdrop:active { @include button(backdrop-active); } + &:backdrop:active, &:backdrop:checked { @include button(backdrop-active); } &:backdrop:insensitive { @include button(backdrop-insensitive); } - &:backdrop:insensitive:active { - @include button(backdrop-insensitive-active); } + &:backdrop:insensitive:active, &:backdrop:insensitive:checked { - @include button(backdrop-insensitive-active); } + @include button(backdrop-insensitive-active); } } // More inline toolbar buttons diff --git a/gtk/resources/theme/Adwaita/_drawing.scss b/gtk/resources/theme/Adwaita/_drawing.scss index fba1e9bb48..fac477fc11 100644 --- a/gtk/resources/theme/Adwaita/_drawing.scss +++ b/gtk/resources/theme/Adwaita/_drawing.scss @@ -39,17 +39,15 @@ background-image: entry_gradient($base_color); $_blank_edge: if($edge == none, none, 0 1px transparentize($edge,1)); $_entry_edge: if($edge == none, none, _widget_edge($edge)); - $_inner_shadows: inset 0 3px mix(black, $base_color, 3%), - inset 0 1px mix(black, $base_color, 18%); - @if $variant == 'dark' { - $_inner_shadows: inset 0 3px mix(black, $base_color, 20%), - inset 0 1px mix(black, $base_color, 35%); - } + $_inner_shadows: inset 0 3px transparentize(black, 0.98), + inset 0 2px transparentize(black, 0.97), + inset 0 1px transparentize(black, 0.92); // we need to match the same shadow types (inset/outset) in various states // hence transparent shadows istead of resetting them when not needed - $_blank_inner_shadows: inset 0 2px transparentize(mix(black, $base_color, 5%),1), - inset 0 1px transparentize(mix(black, $base_color, 18%),1); + $_blank_inner_shadows: inset 0 3px transparentize(black, 1), + inset 0 2px transparentize(black, 1), + inset 0 1px transparentize(black, 1); $_focus_glow_color: if($variant=='light', transparentize($fc,0.85), transparentize($fc,0.3)); diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 5af4c34551..b3a73f36e0 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -160,7 +160,7 @@ GtkFlowBox .grid-child { background-color: transparent; background-image: linear-gradient(to bottom, #212121, #292929 90%); border-color: #1c1f1f; - box-shadow: inset 0 3px #202020, inset 0 1px #1a1a1a, inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); } + box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); } .entry.image.left { padding-left: 0; } .entry.image.right { @@ -170,13 +170,13 @@ GtkFlowBox .grid-child { background-color: transparent; background-image: linear-gradient(to bottom, #212121, #292929 90%); border-color: #1c1f1f; - box-shadow: inset 0 3px #202020, inset 0 1px #1a1a1a, inset 0 0 0 1px rgba(33, 93, 156, 0); + box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0); border: none; border-radius: 0; } .entry:focus { background-color: transparent; background-image: linear-gradient(to bottom, #212121, #292929 90%); - box-shadow: inset 0 3px #202020, inset 0 1px #1a1a1a, inset 0 0 0 1px rgba(33, 93, 156, 0.7), 0 1px rgba(238, 238, 236, 0.1); + box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0.7), 0 1px rgba(238, 238, 236, 0.1); border-color: #0f2b48; } .entry:insensitive { background-color: transparent; @@ -184,21 +184,21 @@ GtkFlowBox .grid-child { color: #939695; border-color: #1c1f1f; background-image: linear-gradient(to bottom, #323636); - box-shadow: inset 0 2px rgba(38, 38, 38, 0), inset 0 1px rgba(33, 33, 33, 0), 0 1px rgba(238, 238, 236, 0.1); } + box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0.1); } .entry:backdrop { background-color: transparent; background-image: linear-gradient(to bottom, #212121, #292929 90%); color: #c9cbc9; border-color: #1e2222; background-image: linear-gradient(to bottom, #2c2c2c); - box-shadow: inset 0 2px rgba(38, 38, 38, 0), inset 0 1px rgba(33, 33, 33, 0), 0 1px rgba(238, 238, 236, 0); } + box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); } .entry:backdrop:insensitive { background-color: transparent; background-image: linear-gradient(to bottom, #212121, #292929 90%); color: #5d6767; border-color: #1e2222; background-image: linear-gradient(to bottom, #323636); - box-shadow: inset 0 2px rgba(38, 38, 38, 0), inset 0 1px rgba(33, 33, 33, 0), 0 1px rgba(238, 238, 236, 0); } + box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); } .entry:selected, .entry:backdrop:selected { background-color: #215d9c; color: #ffffff; } @@ -230,7 +230,7 @@ GtkFlowBox .grid-child { .entry.error:focus { background-color: transparent; background-image: linear-gradient(to bottom, #212121, #292929 90%); - box-shadow: inset 0 3px #202020, inset 0 1px #1a1a1a, inset 0 0 0 1px rgba(204, 0, 0, 0.7), 0 1px rgba(238, 238, 236, 0.1); + box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(204, 0, 0, 0.7), 0 1px rgba(238, 238, 236, 0.1); border-color: #1a0000; } .entry.error:selected, .entry.error:selected:focus { background-color: #cc0000; } @@ -244,7 +244,7 @@ GtkFlowBox .grid-child { .entry.warning:focus { background-color: transparent; background-image: linear-gradient(to bottom, #212121, #292929 90%); - box-shadow: inset 0 3px #202020, inset 0 1px #1a1a1a, inset 0 0 0 1px rgba(245, 121, 0, 0.7), 0 1px rgba(238, 238, 236, 0.1); + box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(245, 121, 0, 0.7), 0 1px rgba(238, 238, 236, 0.1); border-color: #432100; } .entry.warning:selected, .entry.warning:selected:focus { background-color: #f57900; } @@ -881,15 +881,7 @@ GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton { text-shadow: 0 -1px rgba(0, 0, 0, 0.77976); icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976); box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); } - .inline-toolbar GtkToolButton > .button:active { - color: #eeeeec; - outline-color: rgba(238, 238, 236, 0.3); - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #232727, #2d3232); - text-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176); - box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); } - .inline-toolbar GtkToolButton > .button:checked { + .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1c1f1f; @@ -906,19 +898,12 @@ GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton { box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } .inline-toolbar GtkToolButton > .button:insensitive > GtkLabel { color: inherit; } - .inline-toolbar GtkToolButton > .button:insensitive:active { - color: #939695; - border-color: #1c1f1f; - background-image: linear-gradient(to bottom, #2f3333, #323636); - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } - .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel { - color: inherit; } - .inline-toolbar GtkToolButton > .button:insensitive:checked { + .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { color: #939695; border-color: #1c1f1f; background-image: linear-gradient(to bottom, #2f3333, #323636); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); } - .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { + .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { color: inherit; } .inline-toolbar GtkToolButton > .button:backdrop { color: #c9cbc9; @@ -927,12 +912,7 @@ GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .inline-toolbar GtkToolButton > .button:backdrop:active { - color: #c9cbc9; - border-color: #1e2222; - background-image: linear-gradient(to bottom, #2f3434); - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .inline-toolbar GtkToolButton > .button:backdrop:checked { + .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar GtkToolButton > .button:backdrop:checked { color: #c9cbc9; border-color: #1e2222; background-image: linear-gradient(to bottom, #2f3434); @@ -946,19 +926,12 @@ GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton { box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } .inline-toolbar GtkToolButton > .button:backdrop:insensitive > GtkLabel { color: inherit; } - .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active { + .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked { color: #5d6767; border-color: #1e2222; background-image: linear-gradient(to bottom, #262929); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > GtkLabel { - color: inherit; } - .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked { - color: #5d6767; - border-color: #1e2222; - background-image: linear-gradient(to bottom, #262929); - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } - .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > GtkLabel { + .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > GtkLabel { color: inherit; } .inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton, @@ -3297,14 +3270,14 @@ GtkLevelBar.vertical { background-color: transparent; background-image: linear-gradient(to bottom, #212121, #292929 90%); border-color: #1c1f1f; - box-shadow: inset 0 3px #202020, inset 0 1px #1a1a1a, inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); } + box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); } .level-bar.trough:backdrop { background-color: transparent; background-image: linear-gradient(to bottom, #212121, #292929 90%); color: #c9cbc9; border-color: #1e2222; background-image: linear-gradient(to bottom, #2c2c2c); - box-shadow: inset 0 2px rgba(38, 38, 38, 0), inset 0 1px rgba(33, 33, 33, 0), 0 1px rgba(238, 238, 236, 0); } + box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); } .level-bar.fill-block { border: 1px solid #1c5187; background-color: #215d9c; @@ -4164,5 +4137,3 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected { @define-color wm_button_active_color_b shade(#393f3f, 0.89); @define-color wm_button_active_color_c shade(#393f3f, 0.9); @define-color content_view_bg #292929; - -/*# sourceMappingURL=gtk-contained-dark.css.map */ diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 2361e331ba..62d414a87c 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -160,7 +160,7 @@ GtkFlowBox .grid-child { background-color: transparent; background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); border-color: #a1a1a1; - box-shadow: inset 0 3px #f7f7f7, inset 0 1px #d1d1d1, inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; } + box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; } .entry.image.left { padding-left: 0; } .entry.image.right { @@ -170,13 +170,13 @@ GtkFlowBox .grid-child { background-color: transparent; background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); border-color: #a1a1a1; - box-shadow: inset 0 3px #f7f7f7, inset 0 1px #d1d1d1, inset 0 0 0 1px rgba(74, 144, 217, 0); + box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0); border: none; border-radius: 0; } .entry:focus { background-color: transparent; background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); - box-shadow: inset 0 3px #f7f7f7, inset 0 1px #d1d1d1, inset 0 0 0 1px rgba(74, 144, 217, 0.15), 0 1px white; + box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0.15), 0 1px white; border-color: #4a90d9; } .entry:insensitive { background-color: transparent; @@ -184,21 +184,21 @@ GtkFlowBox .grid-child { color: #8d9091; border-color: #a1a1a1; background-image: linear-gradient(to bottom, #f4f4f4); - box-shadow: inset 0 2px rgba(242, 242, 242, 0), inset 0 1px rgba(209, 209, 209, 0), 0 1px white; } + box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px white; } .entry:backdrop { background-color: transparent; background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); color: #54595a; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #fcfcfc); - box-shadow: inset 0 2px rgba(242, 242, 242, 0), inset 0 1px rgba(209, 209, 209, 0), 0 1px rgba(255, 255, 255, 0); } + box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); } .entry:backdrop:insensitive { background-color: transparent; background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); color: #c7c7c7; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #f4f4f4); - box-shadow: inset 0 2px rgba(242, 242, 242, 0), inset 0 1px rgba(209, 209, 209, 0), 0 1px rgba(255, 255, 255, 0); } + box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); } .entry:selected, .entry:backdrop:selected { background-color: #4a90d9; color: #ffffff; } @@ -230,7 +230,7 @@ GtkFlowBox .grid-child { .entry.error:focus { background-color: transparent; background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); - box-shadow: inset 0 3px #f7f7f7, inset 0 1px #d1d1d1, inset 0 0 0 1px rgba(204, 0, 0, 0.15), 0 1px white; + box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(204, 0, 0, 0.15), 0 1px white; border-color: #cc0000; } .entry.error:selected, .entry.error:selected:focus { background-color: #cc0000; } @@ -240,7 +240,7 @@ GtkFlowBox .grid-child { .entry.warning:focus { background-color: transparent; background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); - box-shadow: inset 0 3px #f7f7f7, inset 0 1px #d1d1d1, inset 0 0 0 1px rgba(245, 121, 0, 0.15), 0 1px white; + box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(245, 121, 0, 0.15), 0 1px white; border-color: #f57900; } .entry.warning:selected, .entry.warning:selected:focus { background-color: #f57900; } @@ -873,15 +873,7 @@ GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton { text-shadow: 0 1px rgba(255, 255, 255, 0.76923); icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); box-shadow: inset 0 1px white, 0 1px white; } - .inline-toolbar GtkToolButton > .button:active { - color: #2e3436; - outline-color: rgba(46, 52, 54, 0.3); - border-color: #a1a1a1; - background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0); - text-shadow: 0 1px rgba(255, 255, 255, 0.76923); - icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); - box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; } - .inline-toolbar GtkToolButton > .button:checked { + .inline-toolbar GtkToolButton > .button:active, .inline-toolbar GtkToolButton > .button:checked { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #a1a1a1; @@ -898,19 +890,12 @@ GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton { box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } .inline-toolbar GtkToolButton > .button:insensitive > GtkLabel { color: inherit; } - .inline-toolbar GtkToolButton > .button:insensitive:active { - color: #8d9091; - border-color: #a1a1a1; - background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4); - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } - .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel { - color: inherit; } - .inline-toolbar GtkToolButton > .button:insensitive:checked { + .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar GtkToolButton > .button:insensitive:checked { color: #8d9091; border-color: #a1a1a1; background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; } - .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { + .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel { color: inherit; } .inline-toolbar GtkToolButton > .button:backdrop { color: #54595a; @@ -919,12 +904,7 @@ GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton { text-shadow: none; icon-shadow: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .inline-toolbar GtkToolButton > .button:backdrop:active { - color: #54595a; - border-color: #a8a8a8; - background-image: linear-gradient(to bottom, #d4d4d4); - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .inline-toolbar GtkToolButton > .button:backdrop:checked { + .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar GtkToolButton > .button:backdrop:checked { color: #54595a; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #d4d4d4); @@ -938,19 +918,12 @@ GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton { box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } .inline-toolbar GtkToolButton > .button:backdrop:insensitive > GtkLabel { color: inherit; } - .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active { + .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked { color: #c7c7c7; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #e7e7e7); box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > GtkLabel { - color: inherit; } - .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked { - color: #c7c7c7; - border-color: #a8a8a8; - background-image: linear-gradient(to bottom, #e7e7e7); - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } - .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > GtkLabel { + .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > GtkLabel, .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > GtkLabel { color: inherit; } .inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton, @@ -3436,14 +3409,14 @@ GtkLevelBar.vertical { background-color: transparent; background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); border-color: #a1a1a1; - box-shadow: inset 0 3px #f7f7f7, inset 0 1px #d1d1d1, inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; } + box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; } .level-bar.trough:backdrop { background-color: transparent; background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); color: #54595a; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #fcfcfc); - box-shadow: inset 0 2px rgba(242, 242, 242, 0), inset 0 1px rgba(209, 209, 209, 0), 0 1px rgba(255, 255, 255, 0); } + box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); } .level-bar.fill-block { border: 1px solid #2a76c6; background-color: #4a90d9; @@ -4312,5 +4285,3 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected { @define-color wm_button_active_color_b shade(#ededed, 0.89); @define-color wm_button_active_color_c shade(#ededed, 0.9); @define-color content_view_bg #ffffff; - -/*# sourceMappingURL=gtk-contained.css.map */ -- 2.30.2